Fixes, reverted change causing inexplicable crash