Some fixes for 2013.07.26