Fix buglets