Fixed 404 handler failing and occasional signature fails on authenticated amazon urls.