More bug fixing...