moar dixi fixes, also shoul help with #905