Fixes to some basic stuffs like macros