Fixes related to God Mode