Bugfixes - mostly stuff that was fixed before merge issues