More possible bug fixes