Fixed Small Fixes