AutoJoin: Adapted to new libs
Timestamp: Indentation fix