WIP: Minor cleanup for 0.1

Some minor cleanups ...