Fixes, cleanup, etc.