aaand more fixes