Few additions/fixes