Fixes to basics