Fixed some lingering issues