Fixed Compilation issues

Fixed some compilation issues