Fixcompile

Fix compilation issues.