Bugfixes

Addressing some issues I've been getting bug reports about