Fixed various issues including the NotFoundException