Committing some lingering changes on my machine