Fix last c90 issues; closes #4