Fix compiling woes

2 problems resolved here!