Some tweaks for your application