Minor fixes for future.