Proper fixes