Misc bugs / more left