FIX: address remaining issues