Cleanup, small fixes.