Cleanup & Fix warnings.