Few additions made to keep icc compiler happy