various small updates and build fixes