Few quick fixes