Minor semantic fixes

Fixed minor semantic issues (redundancy, incorrect data types, and
NSDate issue)