Fixes for previous two commits