Slight fixes and preparation for the future.