Some small additions/fixes