Fix for minor issues