Cleanup & fixes