Minor Changes for Internal Customisation

work in progress