Fixes by snufkin