Some more small adjustments to make sure no errors ever happen again