Two fixes; Will rebase