Package bugs fixed