Bugfixes ohoy!