Fixed some lingering bugs