Fixes #282
Small Fixes