Minor bug fixes
Pretty URL fixes.