Buggie fixes