really last fixes, i hope