Suwon Chae 2018-12-12 412beaa sidebar: Add complementary fixes UNIX