Last bug fix, removal of warnings, etc.