Post plugin fixes #2