Fix for review comments