Fixed last minute issues.