FIX issues raised during PR