Made a few small changes to better support my app