Fixes to bugs of previous commit