More misc bugfixes