Added some things to stop App to FC, some methods still give NPEs