Fixes by snufkin.