Added some overrides and resolved some incorrect method callers