Tweaks from LabComputer