Fixes for --enable-complex