Few error fixes