Fix three buglets