Small additions/fixes