Cleanup
Fixed linux build