Fix local issues