FIX: Major bugfixes