Bugfix 20140630

Fix bugs created by modifications at 20140630.