NOTE: Various fixes.