Clean up fixes