Minor bug fixes

Minor Bug fixes