Fallback message and some tidies