Clean up, fixes, etc