Bugfixes here and there, mostly stupid ones