Todo: Add Alexander Rossler's fixes

Signed-off-by: Charles Steinkuehler <charles@steinkuehler.net>