Cleanup and fixations