FINAL FIXES