fixes and borgun