Fixes for owhere to return level