Minor update

Some minor fixes, cleanup