Fixes for friendly URLs