Back to normal?
Final fixes