Freestyled fixes