Debugging a few issues