Bug fixes 20140820