Sneaking in development enhancements

NULL