Apply various tweaks, improvements and fixes