Fixing a few issues I ran into