Fixes?
more fixes?