Compilation fixes, still ISO-90 warnings.