@Ocramius I think both should be fixed.