#7 Fixes