[2014] final tweaks