More small changes/fixes