Just small changes for fixing some runtime errors