Minor cleanups on what was supposed to be working...