Fix some clipping and KeyActions issues...