Quick fixes to make it compile
Quick compile fixes