Minor fixes, require include