Includes #41: review afterwards. Fix Wunused-param