FIX: some minor fixes