Fix/odds n ends