Bugg fixes