Resolve issues with scrolls

There were a few issues with the scroll drops and pickups that needed to be resolved.