FIX various stuff