First quick fixes