Fixes for the OBF organization (no major mistakes, actually).