Multiple bugfixing, including, but not limited to: