Minor clean ups #137