fix small niggles