Attempt at Bug Fixes