sb: Fixed the errors as found by Gedare.