Fixes related to previous commit