Commited Fixes