Minor changes

Added some this.'s
Hopefully fixed an NPE