Fixing compiliation errors