Two fixes