Fix buglets with small improvements