Committing fixes to optware and debian build.