Fix package delcarations