Just some minor bug fixing here and there...