Small fixes + tidying up