Implemented more code fixes