Fixed a few issues with recent updates