fixing types for source/interface/store change
fixing types for source/interface/store change

mikedewar/st-core,nytlabs/st-core,nikhan/st-core,nytlabs/st-core,mikedewar/st-core,nikhan/st-core,nytlabs/st-core,mikedewar/st-core,nikhan/st-core,nikhan/st-core,mikedewar/st-core,nytlabs/st-core