Fixed misc compilation issuesFixed misc compilation issues

Fixed misc compilation issues