Quick but important Fixes