2014.6.5-tweaks