[MaryPopin] Improvements (restore NSInteger, close correction)