Fixing things here and there