Fix minor glitches