Various fixes

Noticed a few issues after 0.0.1