Fixed some issues with prior commits