Fix bugs... again :-(