Fixes due to changes