2014.09.29

Small fixes