Some small changes/fixes