Fixes for previous commit: