Fix a 'x' positioning regression
Fix a nil dereference