Fixes by Chris