Override Whitelisted Methods, minor fixes