Two changes

@zseder