Commit various tweaks