Minor bug fixes for version 0.0.4