Some Temporary Fixes