Updates

Minor bug fixes