Fix very annoying random spacing issues