Fixed build issues due to implicit any