Error and warnings fixes