Compile fix, using standards