Bug fixes 14/07/14