Some quickfixes