fix a few issues w/ 0.4.0