Fixes for the previous commit