Small fixes to bugs

Small changes