Fixes by shalaby