Fixed issues from #48