Minor fixes (thy hopefully fix)