Few fixes in defines.