DRY fixes