Minor updated/fixes