2 small Fixes from my Branch