Fixed compile errros