BUG: Fixes for the perl CFLAGS bug