Fix for review and fix bugs