Bug Fixes 21/05/14