gcc compile fixes
revised