Minor fixes

- Minor fixes