Small fixes to some methods