Fix genlock compile and various updates