FIX: misc stuff