Cleanup, fixes