Some Quick-Fixes;