Misc bugfixes for previous features