Use lunaryorn's after macro and fix compile errors