Revert "Revert a few things"

This reverts commit 73fbe3640bee1ea17aa3a2525412a8cc0032cf53.