Try to fix stuff goodly