[SQUASH ME] moar fixes [still broken]